From 2a276148723f4fdda06e664e9d2ba09821bdafb4 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sun, 1 Dec 2013 20:12:46 +0000
Subject: [PATCH] Steve teaches configure/make about Mac Qt 5.2.0s use of
 frameworks.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4661 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/Makefile.in  |  7 ++-----
 gpsbabel/configure    | 20 +++++++++++++++-----
 gpsbabel/configure.in | 18 +++++++++++++-----
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index f13af31f4..6e2e11bbe 100644
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -51,15 +51,12 @@ LRELEASE=@LRELEASE@
 #OPTIMIZATION=-O $(EXTRA_OPTIMIZATION)
 #DEBUGGING=-g $(EXTRA_DEBUGGING)
 # add -DDEBUG_MEM to turn on memory allocation logging
-GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -I$(srcdir) -I$(QT_INC) \
+GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -I$(srcdir) @QT_INC_OPT@$(QT_INC) \
 	$(OPTIMIZATION) -DHAVE_CONFIG_H @CFLAGS@
 LDFLAGS=$(EXTRA_LDFLAGS) @LDFLAGS@
 PREFIX=@prefix@
 INSTALL_DIR=$(DESTDIR)/$(PREFIX)
 
-# OTHER_ROOT=/opt/local	# For DarwinPorts on OSX
-# OTHER_ROOT=/sw		# Uncomment For Fink on OS X.
-
 MINIMAL_FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin.o \
 	garmin_device_xml.o garmin_tables.o internal_styles.o nmea.o kml.o \
 	wbt-200.o ozi.o pcx.o gdb.o gtrnctr.o xcsv.o explorist_ini.o
@@ -216,7 +213,7 @@ leaktest:
 	tools/memdebug | grep -v '^command line:'
 
 dep:
-	make clean && make EXTRA_CFLAGS="-isystem /sw/include -isystem $(QT_INC) -MMD"  && cat $(sort $(DEPFILES)) > /tmp/dep && rm $(DEPFILES)
+	make clean && make EXTRA_CFLAGS="-isystem /sw/include @QT_SYSINC_OPT@ $(QT_INC) -MMD"  && cat $(sort $(DEPFILES)) > /tmp/dep && rm $(DEPFILES)
 	echo 'internal_styles.cc: mkstyle.sh $$(srcdir)/style/*.style' >> /tmp/dep
 	echo '	$$(srcdir)/mkstyle.sh > internal_styles.cc || (rm -f internal_styles.cc ; exit 1)'  >> /tmp/dep
 	echo Edit Makefile.in and bring in /tmp/dep
diff --git a/gpsbabel/configure b/gpsbabel/configure
index f025e8037..b1bc21859 100755
--- a/gpsbabel/configure
+++ b/gpsbabel/configure
@@ -624,6 +624,8 @@ ac_includes_default="\
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 QT_LIBS
+QT_SYSINC_OPT
+QT_INC_OPT
 QT_INC
 DOCDIR
 INSTALL_DEBUG
@@ -4534,6 +4536,9 @@ if test "$QMAKE" = no ; then
 fi
 
 QT_LIBS="-L$($QMAKE -query QT_INSTALL_LIBS) -l QtCore"
+QT_INC=$($QMAKE -query QT_INSTALL_HEADERS)
+QT_INC_OPT="-I"
+QT_SYSINC_OPT="-isystem"
 
 case "$target" in
     *-*-cygwin* | *-*-mingw32*)
@@ -4596,15 +4601,19 @@ rm -f core conftest.err conftest.$ac_objext \
 
       CFLAGS="$CFLAGS -Imac/libusb/"
 
+      # On mac use frameworks for includes and library files.
       # Macports uses a non-standard build of Qt with an added
       # QT_INSTALL_FRAMEWORKS flag, so look for thier custom
       # version first.  That will fail on 'normal' Qt so fall
       # back to QT_INSTALL_LIBS.
-      QT_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
-      if test $QT_LIBS = "**Unknown**" ; then
-         QT_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
+      QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
+      if test $QT_FW_OR_LIBS = "**Unknown**" ; then
+         QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
       fi
-      QT_LIBS="-F$QT_LIBS -framework QtCore"
+      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
+      QT_INC="$QT_FW_OR_LIBS"
+      QT_INC_OPT="-F"
+      QT_SYSINC_OPT="-iframework"
       ;;
     *)
 	GBSER=gbser_posix.o
@@ -4954,7 +4963,8 @@ fi
 #
 # There's probably some more "autoconfish" way to do this.
 #
-QT_INC=$($QMAKE -query QT_INSTALL_HEADERS)
+
+
 
 
 
diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in
index 5ebd0d379..949a58948 100644
--- a/gpsbabel/configure.in
+++ b/gpsbabel/configure.in
@@ -164,6 +164,9 @@ if test "$QMAKE" = no ; then
 fi
 
 QT_LIBS="-L$($QMAKE -query QT_INSTALL_LIBS) -l QtCore"
+QT_INC=$($QMAKE -query QT_INSTALL_HEADERS)
+QT_INC_OPT="-I"
+QT_SYSINC_OPT="-isystem"
 
 case "$target" in
     *-*-cygwin* | *-*-mingw32*)
@@ -205,15 +208,19 @@ case "$target" in
       AC_DEFINE(HAVE_LIBUSB, 1)
       CFLAGS="$CFLAGS -Imac/libusb/"
  
+      # On mac use frameworks for includes and library files.
       # Macports uses a non-standard build of Qt with an added 
       # QT_INSTALL_FRAMEWORKS flag, so look for thier custom
       # version first.  That will fail on 'normal' Qt so fall 
       # back to QT_INSTALL_LIBS.
-      QT_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
-      if test $QT_LIBS = "**Unknown**" ; then
-         QT_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
+      QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_FRAMEWORKS)
+      if test $QT_FW_OR_LIBS = "**Unknown**" ; then
+         QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
       fi
-      QT_LIBS="-F$QT_LIBS -framework QtCore"
+      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
+      QT_INC="$QT_FW_OR_LIBS"
+      QT_INC_OPT="-F"
+      QT_SYSINC_OPT="-iframework"
       ;;
     *)
 	GBSER=gbser_posix.o
@@ -374,8 +381,9 @@ fi
 #
 # There's probably some more "autoconfish" way to do this.
 #
-QT_INC=$($QMAKE -query QT_INSTALL_HEADERS)
 AC_SUBST(QT_INC)
+AC_SUBST(QT_INC_OPT)
+AC_SUBST(QT_SYSINC_OPT)
 AC_SUBST(QT_LIBS)
 
 AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
-- 
2.30.2